Merge tag 'upstream/2.2.0'
authorGraham Inggs <ginggs@debian.org>
Fri, 27 Jul 2018 08:24:59 +0000 (10:24 +0200)
committerGraham Inggs <ginggs@debian.org>
Fri, 27 Jul 2018 08:24:59 +0000 (10:24 +0200)
commitba940b52efad741860cea87d983ca8d643c1fa83
tree2888f3f071f56b8ab653cee3c88eacf33fc36241
parentc9e87d01924caccbe6b29ae7ea0be1b878e08a68
parent65ff132406229f21782e6590ebc72bd5def1a0d8
Merge tag 'upstream/2.2.0'

Upstream version 2.2.0